Merge version 2.0.15-1+rpi1 and 2.0.15-1.1 to produce 2.0.15-1.1+rpi1

diff --cc debian/changelog
index 4d718cfc75eeb9346d5c51e5a66cd1aa516d7344,098c4e92cde350f1748656686d2e102a2a79a635..0bd35cc42e300586f6b1f2cfa9d722f66371e86f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- 389-ds-base (2.0.15-1+rpi1) bookworm-staging; urgency=medium
++389-ds-base (2.0.15-1.1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Dec 2018 01:27:25 +0000]
 +  * Add -latomic to LDFLAGS on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Apr 2022 16:02:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Oct 2022 12:34:44 +0000
++
+ 389-ds-base (2.0.15-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * CVE-2022-0918: unauthenticated attacker with network access to
+     the LDAP port could cause a denial of service (Closes: #1016445)
+ 
+  -- Adrian Bunk <bunk@debian.org>  Tue, 13 Sep 2022 22:10:45 +0300
  
  389-ds-base (2.0.15-1) unstable; urgency=medium